separator: don't read wide-separators style property
authorCosimo Cecchi <cosimoc@gnome.org>
Wed, 30 Dec 2015 01:44:01 +0000 (17:44 -0800)
committerCosimo Cecchi <cosimoc@gnome.org>
Sun, 3 Jan 2016 08:42:51 +0000 (00:42 -0800)
The notion of a separator being wide or not does not make sense when a
theme can set any CSS property on it, and
separator-width/separator-height are on their way out for
min-width/min-height.

gtk/gtkseparator.c

index a308d8a84c390ae307472ed89da52ea4972bca34..f76fb368e303c4b56e36f3b81a0cd58257c0b4e6 100644 (file)
@@ -114,37 +114,6 @@ gtk_separator_get_property (GObject    *object,
     }
 }
 
-static void
-gtk_separator_measure (GtkCssGadget   *gadget,
-                       GtkOrientation  orientation,
-                       gint            for_size,
-                       gint           *minimum,
-                       gint           *natural,
-                       gint           *minimum_baseline,
-                       gint           *natural_baseline,
-                       gpointer        data)
-{
-  GtkWidget *widget;
-  gboolean wide_sep;
-  gint     sep_width;
-  gint     sep_height;
-
-  widget = gtk_css_gadget_get_owner (gadget);
-
-  gtk_widget_style_get (widget,
-                        "wide-separators",  &wide_sep,
-                        "separator-width",  &sep_width,
-                        "separator-height", &sep_height,
-                        NULL);
-
-  if (orientation == GTK_SEPARATOR (widget)->priv->orientation)
-    *minimum = *natural = 1;
-  else if (orientation == GTK_ORIENTATION_VERTICAL)
-    *minimum = *natural = wide_sep ? sep_height : 1;
-  else
-    *minimum = *natural = wide_sep ? sep_width : 1;
-}
-
 static void
 gtk_separator_get_preferred_width (GtkWidget *widget,
                                    gint      *minimum,
@@ -209,11 +178,8 @@ gtk_separator_init (GtkSeparator *separator)
   widget_node = gtk_widget_get_css_node (GTK_WIDGET (separator));
   separator->priv->gadget = gtk_css_custom_gadget_new_for_node (widget_node,
                                                                 GTK_WIDGET (separator),
-                                                                gtk_separator_measure,
-                                                                NULL,
-                                                                NULL,
-                                                                NULL,
-                                                                NULL);
+                                                                NULL, NULL, NULL,
+                                                                NULL, NULL);
 }
 
 static void